Issue281 - fix #281 and #282

Also see PR: https://github.com/georchestra/template/pull/6 and https://github.com/georchestra/template/pull/7