Deployed: Merge pull request #196 from masondesu/eric

generated from commit 257988aaaa4f40e1211b96d3a57b48290ae4271f