Fix #69 and other small bugs
Merge pull request #128 from caseyjhol/master

Fix #69 and other small bugs