Fixes inline control structures are not allowed. Closes #27.

Signed-off-by: crynobone <crynobone@gmail.com>
Fix indentation.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'