Merge pull request #47 from felixheld/indentation-fixes