Some Fixes
Merge origin/master