removing code smells
Merge branch 'dev' of https://github.com/SWTI2014/SWTI2014-Project-04 into dev