done
Merge pull request #1 from asyed94/master

Some changes