Merged with master
Merge with master
Merged after adding hindi language and tooltips