Merge pull request #7 from tkummermehr/Cosmetics