fixes, updates
readme
readme
Merge remote-tracking branch 'origin'