Some commit
Merge pull request #4 from kobuyashi/master

So I moved things around, feel free to enjoy.