Updated to 1.4.0
Updated to 1.5.0
Merge remote-tracking branch 'upstream/master'