Removed redundant codes
Merge branch 'master' into feature_3