Updates from version 0.40.1

Fixes #27