Merge pull request #7 from lybeck/roope

Roope