Fix #199.
Fix #168.
Merge pull request #1 from munificent/master

Original Repository Update