I've got it. So merging this PR and handling `prop` issue on #31.