Added features.

Added support for if/else if/else statements and switched from using <
and > to delimit type lists to [ and ].