Pull Request for Issue #122

This is my first pull requst.
Sorry, I don't know how to associate pull-request with Issue #122.