updated code to work with melon.js 1.0 and som small fixes
Merge pull request #6 from glennongithub/master

updated code to work with melon.js 1.0 and som small fixes