New version with marker improvements & documentation