ucampas patch and sync'd html

If the patch in #26 is ok, then just merge this one instead.