Fixing issues raised on GitHub
Merge branch 'master' of github.com:kivuto/lp-parallels