fix issue #4
Merge branch 'master' of github.com:locomotivecms/aloha-rails