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

generated from commit ed7563821be657fd15426f0765dc488e227e7279