Merge pull request #411 from caseyjhol/master

v1.3.7 - bug fixes