Merge pull request #32 from Gwayaboy/master

Added support for standard HTML controls
Merge remote-tracking branch 'upstream/master' into dev