Merge pull request #2 from imAlan/master

pull