Fix compile problems.
Merge branch 'master' of https://github.com/etimberg/airguitar