Merge pull request #2 from chiwunau/master

i