Merge pull request #1 from openrt/feature_issue1

Feature issue1