port to 1.7.10
Merge pull request #12 from asiekierka/1.7.2

port to 1.7.10