Merge pull request #1 from lassevk/master

Pull into my fork
Merge pull request #3 from etlewis/master

Merge pull request #2 from lassevk/master