made some contribution to the common file
Merge branch 'master' of https://github.com/knaumova/2ndLS