updated with stuff. and merging
Merge remote-tracking branch 'origin/master' - Latest