fix issues
Merge origin/master