Merge pull request #134 from aaroncampf/master

Changes: See Comment