Fix #313
Merge pull request #317 from caseyjhol/master

Fix #313