Small changes
Merge pull request #549 from kouryuu/patch-1

Small changes