fix
Merge pull request #5 from pmenefee/tiled-merge

fix