Fixing BPS-497
Merge pull request #17 from sajhak/master

Fixing BPS-497