Merge pull request #1 from jmglidden/master

Master
Merge pull request #2 from jmglidden/working

Merge pull request #1 from jmglidden/master