Issue #60
Issue #62
Merge pull request #63 from agonist/master

Fix Issue #60 and Issue #62