Final touch
Yet more fixes
Merge pull request #34 from martme/martin

Martin