Fixed issue #1
Fixed issue #10
Merge pull request #17 from ammubhave/master

Fixed issue #1