Merge pull request #13 from FlorianFieber/upstream-fix

Fix after upstream merge #159
Fixed psi+ build warnings about unused variable and reordering variables
Fix 0820 after upstream merge