various updates, fixes and new features
Merge remote-tracking branch 'origin/master'