Merged changes from dist back into src