Fix issue #226
Easy toolbar no more needed
Bump version
Merge remote-tracking branch 'upstream/master'