work on #40
.
Merge remote-tracking branch 'origin/master'