Cleaned up code
Merge
Merge branch 'master' of github.com:scanniza/DesktopHipster