some updates
Merge origin/master