#67 merge