Merge pull request #8 from tassiahmed/master

Some more changes