Merge pull request #3 from khaledkucse/master

Shahed Sixth Commit
Merge pull request #5 from khaledkucse/slave

Shahed eleventh commit