Merge pull request #14 from ewamarciniak/master

new changes