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

generated from commit 0ea40c7623246da0d3aa9f27276663dc9ed30eff