Merge pull request #1 from jmglidden/master

Master