compiles with 2.064
incorporated changes pointed out by Andrej
Merge pull request #11 from vakkermans/master

compiles with 2.064