Fix building issues
Merge branch 'master' of https://github.com/jasonzhu1991/MusicParser.git