Merge pull request #4 from jaspine/master

Merge pull request #1 from jaspine2/master
Merge pull request #3 from jaspine2/master

Merge pull request #4 from jaspine/master