cleaned up code and fixed a bug
Merge branch 'master' of https://github.com/rsoprivatecloud/qcOStack