Added handling of error event
Merge pull request #9 from amachwe/issue7

Issue7
Merge pull request #10 from amachwe/develop

Develop