Remove min map conflicts
Merge pull request #4 from chris-carrington/Development

Remove min map conflicts