Fix for #6 + Google analytics