Merged updated master
merged updated master , fixed issues