fixes small bug
Merge branch '1.7' into issue#15