Merge pull request #3 from jerturowetz/master

Get the good stuff
Merge pull request #6 from JackBranding/master

Merge pull request #3 from jerturowetz/master