Merge branch 'newfeat'

Conflicts:
readme.md - fixed