Merge pull request #141 from nullquery/master

Pull request for #140