commmit
Fixed merge
merge
Merge pull request #1 from tomwisniewski/master

This is my pull request