v1.8.8 & v3.2.2

Fix issue #41