Merge pull request #114 from glenebob/2.0.12

2.0.12 bug fixes