Refactoring
Refactoring done
Merge branch 'master' of https://github.com/stonemonkey/Internship2013