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

Solved Issue 3
Merge pull request #8 from minsh/dev

Dev fix for issue #3