Improved Code
Merge origin/master