Made bug-fix.
Merge commit 'f153f449e2b47147cbf777000ba2a7b95b4dcadb' into bug-fix
Merge pull request #1 from gsong/bug-fix

Approving pull request.