merge to master for 0.2.16

This pull request resolves numerous functional and performance issues.