update
Merge pull request #319 from jpecht/master

update