Complete revision based on suggestions by thusoy
Merge pull request #30 from martme/martin

Complete revision based on suggestions by thusoy