Merge branch 'master' into stefans-branch
pic to toolbar
Merge pull request #10 from pure-python/stefans-branch

pic on toolbar