fixes #67
Merge branch 'master' of https://github.com/locomotivecms/wagon