Allows optional use of  and

added support and tests for , ,  and

fixes indentation