ysymyth Merge pull request #10 from john-b-yang/master