Updated version is getting bugs on live environment. So I am going to revert. 

git-svn-id: https://plugins.svn.wordpress.org/username/trunk@797054 b8457f37-d9ea-0310-8a92-e5e31aec5664