Merge pull request #1 from abedwardsw/master

Pull request from adam