Roadmap updates for security
whitespace fixes
Merge branch 'pr/200'

closes #200