Updated build code
Merge branch 'master' of https://github.com/shoelsch/SITC

Aligning local and online changes