Making some small changes
Merge origin/master