Merge pull request #2 from nukaga/master

Related #1.