apply review comments. refs #924 and #1052
Merge pull request #1093 from playframework-ja/issues_924

apply review comments. refs #924 and #1052