Merge pull request #1 from halid/preparing

Preparing
Merge pull request #2 from halid/master

Merge pull request #1 from halid/preparing