Merge pull request #1 from idnbso/version_1

Version 1
SHANI
Changes of Shani to version_1