Merge pull request #1 from koush/master

merge from master