Merge pull request #1 from ddenhart/master

update commits
Merge pull request #2 from ddenhart/master

update commits
Merge pull request #9 from Aquanius/Jeremiah-Work

Jeremiah work