work on #82,  ready for integration testing
Merge remote-tracking branch 'origin/master'