#96
Merge remote-tracking branch 'origin/master'
#61
#85
docs update