Void Elements

Complete fix for #27 based on @tjchaplin's PR #28.