#46, #47 POM updated.