Deployed: Merge pull request #182 from masondesu/standards

generated from commit 0cf716f54b147febbca05d29c0d47d02129fcbad