moved roadmap to issue #1
Pulling develop changes into master