Properly adding annotations; fixes #95.