More fixes ^^
Merge branch 'master' of https://github.com/Quetzi/Morpheus