master
Some updates