12/09/2014 version
Merge https://github.com/oluwaetosin/cmmanuel