add guattang
Merge pull request #1880 from guattang/add-guattang

Merging PR from @guattang