Changes for PCM-302
Merge pull request #57 from pbathia/master

Changes for PCM-302