link done
typo
Merge attempt
Merge attempt 2
Merge attempt #3
Merge pull request #21 from sichinumi/master

Merged dustsnow and webs961's changes