Fix issue #17 roadmap