Haxe3
Merge pull request #5 from CJayM/master

Haxe3