Merge pull request #11 from chadicus/master

Couple changes
Merge pull request #12 from chadicus/master

some refactoring and allow Exception to be based to ensure[Not]