Merge pull request #17 from jellydn/phu-branch

Phu branch