BPS-574
Merge pull request #25 from firzhan/master

BPS-574