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

generated from commit c3b34da7d3693841a81827f7108a1c5c178779e1