Merging master code to live

Merging the latest code in master by @naveedaziz to the live server.