Merge pull request #187 from ploetzma/garrisonSupport

Support for building Garrison