Issue20 fix
Issue20 fix
Merge remote-tracking branch: upstream/master