Merge branch 'master' of /home/ssoni/Code/Mine/github/citrix with conflicts.
Fully functional