Merge pull request #6 from silviapfeiffer/master

Merge request for formatting changes.