fixes & some new features
Merge remote-tracking branch 'origin/master'