Fix #75.
Fix #76.
Merge pull request #79 from shadowjay1/master

Fixes.