Refactored
Removed some unused functions
Merge branch 'release/Version_1.0'