bump version 0.1.5
Merge remote-tracking branch 'upstream/master'