Fixed issue #566
Merge pull request #567 from unclechu/master

Fixed issue #566