Fix to issue #32
Update to Fix #32
Merge pull request #33 from haseebgit/develop

Fix to issue #32