Merge branch 'master' of https://github.com/rocalabern/rmodel

Conflicts:
	R/rmodel.R
Merge branch 'master' of https://github.com/rocalabern/rmodel

Conflicts:
	R/rmodel.R