Merge pull request #1 from Pcolar/master

Pull in changes