some more changes
some minor changes continues
Merge pull request #43 from khan4019/master

get latest