Merge pull request #4 from mlund/master

merge w mikael