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

generated from commit 64c8bf92971f80191c40174ad58047d0a353e390