WAR gcc 4.4.7 release bug
Code cleanups
Merge pull request #40 from eile/master

Workaround to compile with gcc 4.4.7 in release mode