Merge pull request #6 from minsh/dev

Solved issue #1
fixed issue #3
Merge pull request #7 from minsh/issue-3

Solved Issue 3