ALShum Merge pull request #2 from hputiprawan2/patch-1