[fix] https://jira.osiam.org/browse/BT-53
Merge pull request #42 from dacrome/fixed-BT-53

[fix] https://jira.osiam.org/browse/BT-53