Merge pull request #28 from davecramer/master

Japanese Translation spelling fixed by Tomonari Katsumata
Merge pull request #29 from davecramer/master

DbKeyStoreSocketFactory was in wrong package
Merge pull request #30 from davecramer/master

Fix cancel timer bug reported by Andriy Redko
Merge pull request #31 from davecramer/master

Bug reference 7766 reported by Zelaine Fong
Merge pull request #32 from davecramer/master

Allow ParseException to be thrown
Merge pull request #33 from davecramer/master

fix bug where update_count not updated correctly