fix for PCM-382
Merge pull request #83 from ardasgup/master

fix for PCM-382