Merge pull request #1 from jFoxSingularity/Andy

Andy merge to master