Merge pull request #40 from lyeary/master

merge