Merge pull request #45 from lyeary/master

asdfasdf