ashutosh bhaiyya ne mar li code ki :(
Set #6 of changes
Set #7 of changes
Merge branch 'develop-merge' of https://github.com/radsaggi/cassetete into develop-merge