Merge pull request #96 from bryan-m-hughes/master

Small bug fixes uncovered by node 0.10
Merge pull request #97 from bryan-m-hughes/master

Small bug fixes