Feature/github

Amir, please merge these commits on your feature/github branch. tnx