changes
Merge pull request #18 from aaronzwiebach/master

Added Exception