Fixes
Merge branch 'master_android' of https://github.com/Jan-Philipp/PSE.git into master_android