Merge pull request #2 from NanneHuiges/develop

Update to handling error states
Typo
Whitespace missing in the description
Merge pull request #3 from uzar/master

Typo
Merge branch 'master' into develop