Issue/#47