several updates
Merge pull request #48 from khalid-bd/updates

several updates