Pushing to production

Includes PR #672.