move option parse to own method
remove self from parse options
comma missing
app.py for fun
Merge branch 'master' into themes