small changes so that it compiles in gcc
Merge pull request #1 from ibeling/master

makes small changes that let it compile in g++