Deployed: Merge pull request #228 from masondesu/eric

generated from commit c2e85ac37b96b0a17cb47a36072ded3a74169aff