Merge pull request #38 from nhr/master

Updated to include comp. deployment guide fix