Merge pull request #2 from mlund/master

merge w. mikael