Merge pull request #73 from ardasgup/master

Fix for PCM-300 & PCM-340
Test SFDC outage on the chromed app - revert later