Merge branch 'release/0.6.1' into development
Help string corrected
Merge branch 'master' of github.com:ximeg/speview into development
Updated classifiers