Merge pull request #1 from ewinslow/master

Final PR
Merge pull request #7 from RiverVanRain/master

Merge pull request #1 from ewinslow/master