Merge in #43