Merge pull request #531 from adrianbroher/master

Fixed compile errors.