Solved Issue#50
Merge branch 'Issue#50'
Merge branch 'master' of https://github.com/florianb/patient-situation