Strike out roadmap issue #1.
Merge branch 'master' into dev