Fixed exception issue
Merge pull request #17 from Ellex/master

Fixed Issue #2