sam's work 2013229
Merge branch 'master' of https://github.com/fsxfreak/Civitatem