more 1.5 -> 1.9
Merge pull request #46 from prymitive/15_to_19

more 1.5 -> 1.9