solve over 100 build errors
Merge pull request #361 from diethard2/master

solve over 100 build errors