A lot of fixes (thanks to taurus)
Merge branch 'master' of github.com:Vitozz/psi-plus-plugins-cmake