Merge pull request #97 from dejan-brkic/master

Exceptions refactoring
Failing update methods fixed. Minor bug fix.