Merge pull request #1 from mjsteger/master

update
Merge branch 'master', remote-tracking branch 'origin'
SEDERAM IS GILBERT
Merge pull request #3 from cjzhang/master

a present from me to you