Ronny's change.
Merge pull request #2 from rchoie/master

Ronny's change.