Some updates to make it works the betterish
Merge remote-tracking branch 'origin/master'
Some updates to make it works the betterish