apply review comments. refs #922 and #1052
Merge pull request #1091 from playframework-ja/issues_922

apply review comments. refs #922 and #1052