Merge pull request #1 from timbillstrom/master

Update fork