some refactorings and fixes/ additional additions
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/transform.js