Merge pull request #171 from micmac1/master