make some changes
Merge pull request #80 from AmirolAhmad/master

make some changes