Changes for PCM-405
Merge pull request #90 from pbathia/master

Changes for PCM-405