Merge pull request #2 from rzymek/1.5

source & target = 1.5