Merge pull request #1 from jFoxSingularity/Andy

Andy merge to master
Merge pull request #2 from jFoxSingularity/master

Merge pull request #1 from jFoxSingularity/Andy