Merge branch 'basic_syntax' / close #1, #2