Changed designed to be more slick
Merge branch 'master' of https://github.com/dylz/Mango