mattn Merge pull request #58 from mahdi-hm/master