Added html option - closes #55 and #57