Fixed issue #113.
Merge pull request #117 from sgundry/master

Fixed issue #113