Merge pull request #39 from ryanricig/master

Give this a try