Merged thomasb/nooj-cmd into master
Merge branch 'master' of https://bitbucket.org/tkb-/nooj-cmd