tweaks and comments
Merge pull request #1 from tansaku/master

tweaks and comments