Revert "Revert "Merge pull request #160 from gjuggler/master""

This reverts commit c5383776cfd4a434b4313ee712f9005810e699e4.
v1.3.7 conflict resolution during re-merge