Merging additional commits by Hamcha

as per title