Porting to 1.7.10
Merge pull request #6 from AntonBoch1244/patch-1

Porting to 1.7.10