Merge pull request #64 from drobbs/master

Tiled stuff