Final fixes. Satisfied with the results of our bug fixes.
Merge pull request #452 from Jedwondle/v1.1

Final fixes. Satisfied with the results of our bug fixes.