Merge pull request #19 from wigyori/master