Merge pull request #789 from flipjs/add-flipjs

Merging PR from @flipjs
rebuilt with @flipjs added!
Added @flipjs