TODO modified
Merge branch 'master' of github.com:ximeg/speview