Fixes issue #318
Merge branch 'master' of http://github.com/OnsenUI/OnsenUI