Merge pull request #68 from liuhenry/master