Merge pull request #4 from lybeck/lasse

Refactoring