Exception refactoring
Merge remote-tracking branch 'origin/exception_refactoring'
Merge pull request #101 from dejan-brkic/master

Exceptions refactoring