Merge pull request #101 from dejan-brkic/master

Exceptions refactoring
Merge remote-tracking branch 'upstream/master'