Issues from #75 pushed