Merge pull request #87 from ardasgup/master

fix for PCM-380 & PCM-381