Merge branch 'gh-pages'
Moved methods to prototype, included addEventListener method
Merge branch 'master' into gh-pages