updates
Merge remote-tracking branch 'refs/remotes/adass/master'