MD-654-2

changes
Merge pull request #7 from elmaanum/MD-654-2

MD-654-2