some changes
Merge pull request #1 from xnimorz/master

some changes