Exceptions added
exceptions added
Merge pull request #34 from ky822/master

exceptions added