Merge pull request #2 from jerturowetz/master

Get all the good stuff!
Merge pull request #4 from JackBranding/master

Merge pull request #2 from jerturowetz/master