Merge pull request #81 from pkg/withMessage-withStack

Refactor withMessage/withStack