Merge pull request #63 from mehlis/master

fix missing includes