exception commit
Merge pull request #15 from wtnbjn/exception_branch

exception commit