Merge pull request #1 from openrt/feature_issue1

Feature issue1
Merge pull request #2 from openrt/master

Merge pull request #1 from openrt/feature_issue1