some changes
Merge pull request #1 from nazlo/newBranch

some changes