Merge pull request #1 from zmughal/master

some fixes