Fixes #1
fixes #1

Merge branch 'master' of github.com:SNAPwg/SNAP

Conflicts:
	fiddles.R