apply review comments. refs #921 #1052
Merge pull request #1090 from playframework-ja/issues_921

apply review comments. refs #921 #1052