Merge pull request #1 from openfl/master

Update from Master