Merge pull request #7 from rwijaya/MDL-27441b