merge modifs for v0.8 and v0.10

fixes #15