Fix for issue quaddra/si#173
Merge branch 'master' of github.com:quaddra/engage