Merge pull request #1 from manuq/master

More cosmetics