update
Merge pull request #1 from jrybin/master

update 1