Merge pull request #1 from trentm/master

update fork