Working on fixing issue #7
Merge branch 'master' of https://github.com/micksi/med603