Fix in by-ref
Implemented S flavors
Merge remote-tracking branch 'fptudelft/master' into HEAD

Conflicts:
	demo/index.html