Merge pull request #1 from mazzarb1/master

Pull