Merge changes PR 119 to allow @elseif and no space between @if and the bracket
Verbump