Merge branch 'next'
version 0.5.4
Merge branch 'next'
Merge branch 'next'
Update README.md
Merge branch 'master' into next

Conflicts:
	src/ratools.h