Changes for #42