My first commit

Here are the comments for the pull request.

Alizera - Can you please take look at it (one minute) @alirezakamran