Added html5 support