Fixed MAP
Merge branch 'Design' of https://github.com/Omnes/Bananas into Design