#237
Merge branch 'master' into FindBug237
close #237
Merge pull request #269 from rhsu/FindBug237

Find bug237