Merge pull request #264 from akofink/master

This merge closes pull request 120 and 264
Added bundler support