Merge pull request #45 from c3h3/master

merge