Proposed changes for issue #15

Regarding https://github.com/X39/XMedSys1/issues/15