editted code
Merge https://github.com/kiptoo/Derrick-s-App