Buildfix
Merge pull request #481 from raven02/master

Buildfix