Fixes to browserify branch
Merge pull request #3 from asterick/browserify

Browserify