some updates
Merge branch 'master' of https://github.com/kablag/RDML

Conflicts:
	DESCRIPTION