fixes to address
Merge origin/master