Fixed #132
Merge branch 'master' of github.com:StratusLab/client