refactored for ease of use in eclipse
Merge branch 'master' of https://github.com/Teferet/project6