Fix #1 and add Google Universal Analytics