cmr Merge pull request #1 from leeopop/dev …