Merge pull request #181 from chuckdumont/master

Fix issues running on IBM Domino
Merge remote-tracking branch 'jaggr/master'