fixes #163
Merge branch 'master' of https://github.com/novosga/novosga into demo