updated for correctness when run on server
Merge branch 'master' of https://github.com/RoddiPotter/cicstart