backup commit 2014.05.23
initially refactored exception macros
Merge branch 'refactor-exceptions' into refactor-tests
backup commit 2014.05.24 02:40