drael Merge pull request #12 from shahar481/merging_to_original_repo