Fixed some build errors
Merge pull request #190 from mannol1/master

Fixed some build errors