Version 12.0

Previous pull request #96 contained a couple commits for version 12.0.