piggz Merge pull request #4 from b100dian/master