Fixed issue #334
Merge remote-tracking branch 'nuvolo/master'