update for 2.0
Merge branch 'next'

Conflicts:
	README.md
Merge branch 'next'

Conflicts:
	README.md
add specs