made it work with browserify, soooo much better than before
Merge branch 'dev'