fix (#40
Merge branch '0.3'

Conflicts:
	R/internal.R