Merge pull request #39 from c3h3/master

merge yhstock