Merge pull request #10 from szymku/master

j