Merge pull request #1 from irlanrobson/master

Pull from master!