Work in progress
Merge remote-tracking branch 'upstream/master'
Exceptions refactoring
Merge pull request #97 from dejan-brkic/master

Exceptions refactoring