Step1.1 Cleanup
Merge branch 'master' of https://github.com/johnthebrave/codemarathon