new raf solution

I still have not completely tested this approach. but so far it is
working.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html