Work on discussion
Merge pull request #33 from lybeck/lasse

Work on discussion