Castle and Gate updates
Merge branch 'master' of https://github.com/egleiser/DemonParasol