Added some simple error control to the eventListener.
Merge branch 'dev' into 'master'.
Updated README code samples & fixed some formatting.