change 'extend' to 'update'
Merge pull request #30 from 235/patch-1

change 'extend' to 'update'
Merge pull request #2 from axiak/master

latest from upstream