final touch-ups
Merge pull request #2 from summermichiko/master

final touch-ups