compatibility fixes for g++ 4.2
Merge branch 'workshop' of https://github.com/MrKepzie/Powiter into workshop