Merge pull request #120 from ddumontatibm/master

Update whitespace, indents according to new rules.