Pull in fixes
Merge pull request #7 from creationix/master

Pull in fixes