#77
Merge pull request #103 from lipki/1.7

#77