added back func
added back func merge
Merge branch 'master' of https://github.com/theexar/Hackaton-Telerik-June-2014