Address findbugs warning.
Merge branch 'master' into findbug
Merge pull request #205 from tonyhuang/findbug

Address findbugs warning.