upgrade to 1.5.0
Merge remote-tracking branch 'origin/master'