Merge pull request #105 from schue30/master