Merge pull request #8 from lybeck/roope

Roope