Fixed compiler error cuased by previous commit
Merge branch 'master' of https://github.com/Winklebot/Winklebot