Merge pull request #1 from halid/preparing

Preparing