Merge branch 'master' into refactor
Move stmts to vars, comment code
Add TODO for parseOptions
Merge branch 'refactor'