Merge branch 'options' of github.com:h0ru5/jetzt into options