Fixes of SAT-237 , SAT-238 , SAT-239, SAT-240, SAT-241, SAT-242, SAT-243 , SAT-244, SAT-245
Merge pull request #1 from viveksh/master

SAT-237 , SAT-238 , SAT-239, SAT-240, SAT-241, SAT-242, SAT-243 , SAT-244, SAT-245