Fixed another bug.
Merge pull request #35 from arshsab/master

Some more bug fixes.