Deployed: Merge pull request #62 from masondesu/eric-fix-branch

generated from commit 70b88272842c8ccc9971b6f5d0b04316251a02b5