Merge pull request #2 from BrunoChauvet/master

merge changes from Bruno
Merge branch 'master' of github.com:nickhargreaves/MapFour