Issue21
Merge remote-tracking branch: upstream/master