Prepare for sync with the issue #37 bugfix branch.