Merge pull request #10 from GibraltarSoftware/master

Changes for 3.5.4.1570
Merge branch 'master' into develop
Corrected thread safety issue with dictionary
Merge pull request #11 from GibraltarSoftware/develop

Develop