Merge pull request #114 from oxylusengine/2d_fixes