my part
Merge pull request #1 from rsivapr/master

just some changes mane