Github 32

Remake of PR #32, to show the changes to commit messages and code style fixes.