Adjusting code for Live site
Merge branch 'develop'