Merge pull request #19 from jellydn/phu-branch

Phu branch