Deployed: Merge pull request #164 from masondesu/eric

generated from commit 1147d011b234b91f66825b8b48a3532057d22760