Update to v2.1.2
Merge pull request #1 from conradz/update-v2.1.2

Update to v2.1.2