some changes
Merge pull request #6 from sharuk92/master

some changes..