Merge pull request #1 from AmirMoniri/master

Pull request
Merge pull request #6 from DanielMuharemiThm/topicBranch

Merge pull request #1 from AmirMoniri/master