Merge pull request #43 from mjdenham/master

JS-196, JS-275, JS-274: 3 fixes recently discussed on jsword-devel