Fix #111 & #110
Merge pull request #112 from caseyjhol/master

Fix #111 & #110