Merge branches 'master' and 'adderror'
Merge pull request #19 from Hasimir/master

Merge branches 'master' and 'adderror'