Merge pull request #1 from hoosin/master

UPDATE
Merge pull request #2 from heysb/master

Merge pull request #1 from hoosin/master