removed commented code
code tidy, correct javadoc
Merge pull request #20 from PatientView/feature/looking-local

Feature/looking local
Merge pull request #21 from PatientView/develop

Develop