Fixed issue #497
Merge pull request #498 from jtmarmon/master

Fixed issue #497