Merge pull request #12 from wigyori/master