Apparently a fix from Mike that covers map issues.
Merge branch 'david' of https://github.com/alanly/COMP345 into david