gh-97: Issue is now complete. Ready for deployment.