Review of the latest, with suggested changes.
Merge pull request #145 from anssiko/review

Review of the latest, with suggested changes.