removing extra lines
Merge branch 'master' into beta
removing unused lines
Updating Code
Code Coverage