some changes
Merge pull request #1 from tlashaz/master

some changes