Merge pull request #2 from HaxeFlixel/master

Merging from HaxeFlixel