fleshed out description
Merge branch 'dev'

Conflicts:
	README.rst
fixed package