final refactorings
Merge branch 'master' of https://github.com/SWTI2014/SWTI2014-Project-12
one of the final refactorings