another change, shouldn't be conflicting
Merge pull request #2 from rainboxx/new-change-master

another change, shouldn't be conflicting

second branch integrated first