sync with latest update
Merge pull request #4 from oetiker/master

sync with latest update