fixed #4
Replaced todo before release with link to milestone