Work in browser land
Merge pull request #47 from wraithgar/master

Work in browser land