Merge pull request #86 from vangdfang/master