Fixed issue #244
Merge origin/master