Merge pull request #524 from micmac1/master-dahlin