diff --git a/CHANGELOG.md b/CHANGELOG.md
index 495236e..046fcda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,34 +1,41 @@
+###v1.7.0 (24th April 2016)
+
+- Added `<address>` to examples
+- Updated to v4.1.1 of `normalize.css`
+- Updated to v3.7.3 of HTML5 Shiv
+- Styled code in changelog
+
 ###v1.6.5 (17th January 2016)
 
 - Updated sample footer copyright date to 2016
 
 ###v1.6.4 (10th January 2015)
 
-- Upgraded to v3.0.2 of normalize.css
+- Upgraded to v3.0.2 of `normalize.css`
 - Updated sample footer copyright date to 2015
 - Converted tabs to spaces in code indentation
 
 ###v1.6.3 (4th May 2014)
 
 - Upgraded to version prev3.7.2 of the HTML5 Shiv
-- Upgraded to version 1.1.3 of normalize-legacy.css and v3.0.1 of normalize.css
+- Upgraded to version 1.1.3 of `normalize-legacy.css` and v3.0.1 of `normalize.css`
 - Removed Google Analytics code
 - Added basic bower support
 
 ###v1.6.2 (30th June 2013)
 
-- Renamed index.html to main-template.html
+- Renamed `index.html` to `main-template.html`
 - Moved all HTML5 multimedia related files into multimedia sub-directory
-- Renamed index-bare-bones.html to main-template-bare-bones.html and index-no-coments.html to main-template-no-comments.html. These were also moved into the clean-templates sub-directory
-- Changed doctype back to DOCTYPE (simply because I prefer it that way)
+- Renamed `index-bare-bones.html` to `main-template-bare-bones.html` and `index-no-coments.html` to `main-template-no-comments.html`. These were also moved into the `clean-templates` sub-directory
+- Changed `doctype` back to `DOCTYPE` (simply because I prefer it that way)
 
 ###v1.6.1 (8th April 2013)
 
-- Added some extra <nav> element placement advice
-- Changed "click" events on Android event handlers to "touchstart"
+- Added some extra `<nav>` element placement advice
+- Changed `click` events on Android event handlers to `touchstart`
 - Updated Flash fallback for audio files
-- Upgraded to latest versions of Normalize.css (v2.1.1 and v1.1.1 for legacy)
-- The "click" event handlers are only necessary for pre Android 4 devices, so the JavaScript for that has been changed
+- Upgraded to latest versions of `normalize.css` (v2.1.1 and v1.1.1 for legacy)
+- The `click` event handlers are only necessary for pre Android 4 devices, so the JavaScript for that has been changed
 - The Flash Player used for the fallback video and audio is actually from [JW Player](http://www.longtailvideo.com/jw-player/)
 - Some minor comment changes
 
@@ -41,40 +48,40 @@
 
 - Added template for HTML5 video with subtitles
 - Added default CSS link styling for accessibility
-- Upgraded normalize-legacy.css to v1.1.0
+- Upgraded `normalize-legacy.css` to v1.1.0
 
 ###v1.4.1 (21st January 2013)
 
-- Upgraded to normalize.css [v2.1.0](https://github.com/necolas/normalize.css/blob/v2.1.0/CHANGELOG.md) (which includes the main element)
-- 2012 -> 2013 in index.html comments
+- Upgraded to `normalize.css` [v2.1.0](https://github.com/necolas/normalize.css/blob/v2.1.0/CHANGELOG.md) (which includes the main element)
+- 2012 -> 2013 in `index.html` comments
 
 ###v1.4.0 (20th January 2013)
 
-- Added main element
-- Changed DOCTYPE to doctype
+- Added `<main>` element
+- Changed `DOCTYPE` to `doctype`
 
 ###v1.3.2 (9th January 2013)
 
-- Updated version of html5shiv-printshiv.js in preparation for future inclusion of the <main> element
-- Added option to use normalize-legacy.css for older browser support
+- Updated version of `html5shiv-printshiv.js` in preparation for future inclusion of the `<main>` element
+- Added option to use `normalize-legacy.css` for older browser support
 
 ###v1.3.1 (4th January 2013)
 
 - Added cutdown "bare bones" template file for pedants
-- Removed superfluous htmlshiv.js file
+- Removed superfluous `htmlshiv.js` file
 
 ###v1.3.0 (1st January 2013)
 
 - Added commented HTML5 audio template file
 - Added changelog
 - Added JavaScript for Android video play to HTML5 video template file
-- Fixed incorrect closing section tag in index-no-comments.html
+- Fixed incorrect closing section tag in `index-no-comments.html`
 
 ###v1.2.0 (31st December 2012)
 
-- Added cutdown, no comments version of index.html [#2](https://github.com/iandevlin/html5bones/issues/2)
+- Added cutdown, no comments version of `index.html` [#2](https://github.com/iandevlin/html5bones/issues/2)
 - Replaced Google Analytics script with Mathias Bynens' optimised version [#8](https://github.com/iandevlin/html5bones/issues/8)
-- Removed redundant html5shiv.js file [#4](https://github.com/iandevlin/html5bones/issues/4)
+- Removed redundant `html5shiv.js` file [#4](https://github.com/iandevlin/html5bones/issues/4)
 - Added MIT licence [#6](https://github.com/iandevlin/html5bones/issues/6)
 - Removed XHTML self-closing tag slashes [#5](https://github.com/iandevlin/html5bones/issues/5)
 - Added comments on origin of Google Video Player SWF file [#3](https://github.com/iandevlin/html5bones/issues/3)
@@ -85,5 +92,5 @@
 
 ###v1.0.2 (19th December 2012)
 
-- Extra comments added to index.html
-- Google Analytics moved to bottom of template [#1](https://github.com/iandevlin/html5bones/issues/1)
\ No newline at end of file
+- Extra comments added to `index.html`
+- Google Analytics moved to bottom of template [#1](https://github.com/iandevlin/html5bones/issues/1)
diff --git a/README.md b/README.md
index 8384a6f..960964b 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Features
 
 Documentation
 =============
-The documentation is contained within inline comments in the various files, but especially main-template.html.
+The documentation is contained within inline comments in the various files, but especially `main-template.html`.
 
 Contribute
 ==========
diff --git a/clean-templates/main-template-no-comments.html b/clean-templates/main-template-no-comments.html
index d58613a..eb82d76 100644
--- a/clean-templates/main-template-no-comments.html
+++ b/clean-templates/main-template-no-comments.html
@@ -1,31 +1,34 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">  
+    <meta charset="utf-8">
     <title>PAGE TITLE</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="css/normalize.css" rel="stylesheet" media="all">
-    <link href="css/styles.css" rel="stylesheet" media="all">   
+    <link href="css/styles.css" rel="stylesheet" media="all">
     <!--[if lt IE 9]><script src="js/html5shiv-printshiv.js" media="all"></script><![endif]-->
 </head>
 <body>
-    <header role="banner">  
+    <header role="banner">
         <h1>Main Title</h1>
         <nav role="navigation">
-        
+
         </nav>
     </header>
-    
+
     <div class="wrap">
         <main role="main">
-        
+
         </main>
     </div>
-    
+
     <footer role="contentinfo">
+        <address>
+          <p>For further information, please contact <a href="mailto:admin@example.com">Max Mustermann</a>.</p>
+        </address>
         <small>Copyright &copy; <time datetime="2016">2016</time></small>
     </footer>
-    
+
 </body>
 </html>
diff --git a/css/normalize.css b/css/normalize.css
index 458eea1..18ddf7f 100644
--- a/css/normalize.css
+++ b/css/normalize.css
@@ -1,9 +1,8 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */
 
 /**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
+ * 1. Change the default font family in all browsers (opinionated).
+ * 2. Prevent adjustments of font size after orientation changes in IE and iOS.
  */
 
 html {
@@ -13,7 +12,7 @@ html {
 }
 
 /**
- * Remove default margin.
+ * Remove the margin in all browsers (opinionated).
  */
 
 body {
@@ -24,44 +23,39 @@ body {
    ========================================================================== */
 
 /**
- * Correct `block` display not defined for any HTML5 element in IE 8/9.
- * Correct `block` display not defined for `details` or `summary` in IE 10/11
- * and Firefox.
- * Correct `block` display not defined for `main` in IE 11.
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in Edge, IE, and Firefox.
+ * 2. Add the correct display in IE.
  */
 
 article,
 aside,
-details,
+details, /* 1 */
 figcaption,
 figure,
 footer,
 header,
-hgroup,
-main,
+main, /* 2 */
 menu,
 nav,
 section,
-summary {
+summary { /* 1 */
   display: block;
 }
 
 /**
- * 1. Correct `inline-block` display not defined in IE 8/9.
- * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ * Add the correct display in IE 9-.
  */
 
 audio,
 canvas,
 progress,
 video {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
+  display: inline-block;
 }
 
 /**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
+ * Add the correct display in iOS 4-7.
  */
 
 audio:not([controls]) {
@@ -70,12 +64,20 @@ audio:not([controls]) {
 }
 
 /**
- * Address `[hidden]` styling not present in IE 8/9/10.
- * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
  */
 
-[hidden],
-template {
+progress {
+  vertical-align: baseline;
+}
+
+/**
+ * Add the correct display in IE 10-.
+ * 1. Add the correct display in IE.
+ */
+
+template, /* 1 */
+[hidden] {
   display: none;
 }
 
@@ -83,44 +85,59 @@ template {
    ========================================================================== */
 
 /**
- * Remove the gray background color from active links in IE 10.
+ * 1. Remove the gray background on active links in IE 10.
+ * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
  */
 
 a {
-  background-color: transparent;
+  background-color: transparent; /* 1 */
+  -webkit-text-decoration-skip: objects; /* 2 */
 }
 
 /**
- * Improve readability when focused and also mouse hovered in all browsers.
+ * Remove the outline on focused links when they are also active or hovered
+ * in all browsers (opinionated).
  */
 
 a:active,
 a:hover {
-  outline: 0;
+  outline-width: 0;
 }
 
 /* Text-level semantics
    ========================================================================== */
 
 /**
- * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ * 1. Remove the bottom border in Firefox 39-.
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
  */
 
 abbr[title] {
-  border-bottom: 1px dotted;
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
 }
 
 /**
- * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
  */
 
 b,
 strong {
-  font-weight: bold;
+  font-weight: inherit;
 }
 
 /**
- * Address styling not present in Safari and Chrome.
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * Add the correct font style in Android 4.3-.
  */
 
 dfn {
@@ -128,8 +145,8 @@ dfn {
 }
 
 /**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari, and Chrome.
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
  */
 
 h1 {
@@ -138,16 +155,16 @@ h1 {
 }
 
 /**
- * Address styling not present in IE 8/9.
+ * Add the correct background and color in IE 9-.
  */
 
 mark {
-  background: #ff0;
+  background-color: #ff0;
   color: #000;
 }
 
 /**
- * Address inconsistent and variable font size in all browsers.
+ * Add the correct font size in all browsers.
  */
 
 small {
@@ -155,7 +172,8 @@ small {
 }
 
 /**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
  */
 
 sub,
@@ -166,27 +184,27 @@ sup {
   vertical-align: baseline;
 }
 
-sup {
-  top: -0.5em;
-}
-
 sub {
   bottom: -0.25em;
 }
 
+sup {
+  top: -0.5em;
+}
+
 /* Embedded content
    ========================================================================== */
 
 /**
- * Remove border when inside `a` element in IE 8/9/10.
+ * Remove the border on images inside links in IE 10-.
  */
 
 img {
-  border: 0;
+  border-style: none;
 }
 
 /**
- * Correct overflow not hidden in IE 9/10/11.
+ * Hide the overflow in IE.
  */
 
 svg:not(:root) {
@@ -197,231 +215,205 @@ svg:not(:root) {
    ========================================================================== */
 
 /**
- * Address margin not present in IE 8/9 and Safari.
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
  */
 
-figure {
-  margin: 1em 40px;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
 }
 
 /**
- * Contain overflow in all browsers.
+ * Add the correct margin in IE 8.
  */
 
-pre {
-  overflow: auto;
+figure {
+  margin: 1em 40px;
 }
 
 /**
- * Address odd `em`-unit font size rendering in all browsers.
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
  */
 
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
 }
 
 /* Forms
    ========================================================================== */
 
 /**
- * Known limitation: by default, Chrome and Safari on OS X allow very limited
- * styling of `select`, unless a `border` property is set.
- */
-
-/**
- * 1. Correct color not being inherited.
- *    Known issue: affects color of disabled elements.
- * 2. Correct font properties not being inherited.
- * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ * 1. Change font properties to `inherit` in all browsers (opinionated).
+ * 2. Remove the margin in Firefox and Safari.
  */
 
 button,
 input,
-optgroup,
 select,
 textarea {
-  color: inherit; /* 1 */
-  font: inherit; /* 2 */
-  margin: 0; /* 3 */
+  font: inherit; /* 1 */
+  margin: 0; /* 2 */
 }
 
 /**
- * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ * Restore the font weight unset by the previous rule.
  */
 
-button {
-  overflow: visible;
+optgroup {
+  font-weight: bold;
 }
 
 /**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
- * Correct `select` style inheritance in Firefox.
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
  */
 
 button,
-select {
-  text-transform: none;
+input { /* 1 */
+  overflow: visible;
 }
 
 /**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
  */
 
 button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-  -webkit-appearance: button; /* 2 */
-  cursor: pointer; /* 3 */
+select { /* 1 */
+  text-transform: none;
 }
 
 /**
- * Re-set default cursor for disabled elements.
+ * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
+ *    controls in Android 4.
+ * 2. Correct the inability to style clickable types in iOS and Safari.
  */
 
-button[disabled],
-html input[disabled] {
-  cursor: default;
+button,
+html [type="button"], /* 1 */
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button; /* 2 */
 }
 
 /**
- * Remove inner padding and border in Firefox 4+.
+ * Remove the inner border and padding in Firefox.
  */
 
 button::-moz-focus-inner,
-input::-moz-focus-inner {
-  border: 0;
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
   padding: 0;
 }
 
 /**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
+ * Restore the focus styles unset by the previous rule.
  */
 
-input {
-  line-height: normal;
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
 }
 
 /**
- * It's recommended that you don't attempt to style these elements.
- * Firefox's implementation doesn't respect box-sizing, padding, or width.
- *
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
- * 2. Remove excess padding in IE 8/9/10.
+ * Change the border, margin, and padding in all browsers (opinionated).
  */
 
-input[type="checkbox"],
-input[type="radio"] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
 }
 
 /**
- * Fix the cursor style for Chrome's increment/decrement buttons. For certain
- * `font-size` values of the `input`, it causes the cursor style of the
- * decrement button to change from `default` to `text`.
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
  */
 
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  height: auto;
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
 }
 
 /**
- * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
- *    (include `-moz` to future-proof).
+ * Remove the default vertical scrollbar in IE.
  */
 
-input[type="search"] {
-  -webkit-appearance: textfield; /* 1 */
-  -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box; /* 2 */
-  box-sizing: content-box;
+textarea {
+  overflow: auto;
 }
 
 /**
- * Remove inner padding and search cancel button in Safari and Chrome on OS X.
- * Safari (but not Chrome) clips the cancel button when the search input has
- * padding (and `textfield` appearance).
+ * 1. Add the correct box sizing in IE 10-.
+ * 2. Remove the padding in IE 10-.
  */
 
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
 }
 
 /**
- * Define consistent border, margin, and padding.
+ * Correct the cursor style of increment and decrement buttons in Chrome.
  */
 
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
 }
 
 /**
- * 1. Correct `color` not being inherited in IE 8/9/10/11.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
  */
 
-legend {
-  border: 0; /* 1 */
-  padding: 0; /* 2 */
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
 }
 
 /**
- * Remove default vertical scrollbar in IE 8/9/10/11.
+ * Remove the inner padding and cancel buttons in Chrome and Safari on OS X.
  */
 
-textarea {
-  overflow: auto;
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
 }
 
 /**
- * Don't inherit the `font-weight` (applied by a rule above).
- * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ * Correct the text style of placeholders in Chrome, Edge, and Safari.
  */
 
-optgroup {
-  font-weight: bold;
+::-webkit-input-placeholder {
+  color: inherit;
+  opacity: 0.54;
 }
 
-/* Tables
-   ========================================================================== */
-
 /**
- * Remove most spacing between table cells.
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
  */
 
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-td,
-th {
-  padding: 0;
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
 }
diff --git a/js/html5shiv-printshiv.js b/js/html5shiv-printshiv.js
index dea63bf..54b47bb 100644
--- a/js/html5shiv-printshiv.js
+++ b/js/html5shiv-printshiv.js
@@ -1,4 +1,4 @@
 /**
-* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
 */
-!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=y.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=y.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),y.elements=c+" "+a,j(b)}function f(a){var b=x[a[v]];return b||(b={},w++,a[v]=w,x[w]=b),b}function g(a,c,d){if(c||(c=b),q)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():u.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||t.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),q)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return y.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(y,b.frag)}function j(a){a||(a=b);var d=f(a);return!y.shivCSS||p||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),q||i(a,d),a}function k(a){for(var b,c=a.getElementsByTagName("*"),e=c.length,f=RegExp("^(?:"+d().join("|")+")$","i"),g=[];e--;)b=c[e],f.test(b.nodeName)&&g.push(b.applyElement(l(b)));return g}function l(a){for(var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(A+":"+a.nodeName);d--;)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function m(a){for(var b,c=a.split("{"),e=c.length,f=RegExp("(^|[\\s,>+~])("+d().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),g="$1"+A+"\\:$2";e--;)b=c[e]=c[e].split("}"),b[b.length-1]=b[b.length-1].replace(f,g),c[e]=b.join("}");return c.join("{")}function n(a){for(var b=a.length;b--;)a[b].removeNode()}function o(a){function b(){clearTimeout(g._removeSheetTimer),d&&d.removeNode(!0),d=null}var d,e,g=f(a),h=a.namespaces,i=a.parentWindow;return!B||a.printShived?a:("undefined"==typeof h[A]&&h.add(A),i.attachEvent("onbeforeprint",function(){b();for(var f,g,h,i=a.styleSheets,j=[],l=i.length,n=Array(l);l--;)n[l]=i[l];for(;h=n.pop();)if(!h.disabled&&z.test(h.media)){try{f=h.imports,g=f.length}catch(o){g=0}for(l=0;g>l;l++)n.push(f[l]);try{j.push(h.cssText)}catch(o){}}j=m(j.reverse().join("")),e=k(a),d=c(a,j)}),i.attachEvent("onafterprint",function(){n(e),clearTimeout(g._removeSheetTimer),g._removeSheetTimer=setTimeout(b,500)}),a.printShived=!0,a)}var p,q,r="3.7.2",s=a.html5||{},t=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,u=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,v="_html5shiv",w=0,x={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",p="hidden"in a,q=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){p=!0,q=!0}}();var y={elements:s.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:r,shivCSS:s.shivCSS!==!1,supportsUnknownElements:q,shivMethods:s.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=y,j(b);var z=/^$|\b(?:all|print)\b/,A="html5shiv",B=!q&&function(){var c=b.documentElement;return!("undefined"==typeof b.namespaces||"undefined"==typeof b.parentWindow||"undefined"==typeof c.applyElement||"undefined"==typeof c.removeNode||"undefined"==typeof a.attachEvent)}();y.type+=" print",y.shivPrint=o,o(b)}(this,document);
\ No newline at end of file
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=y.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=y.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),y.elements=c+" "+a,j(b)}function f(a){var b=x[a[v]];return b||(b={},w++,a[v]=w,x[w]=b),b}function g(a,c,d){if(c||(c=b),q)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():u.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||t.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),q)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return y.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(y,b.frag)}function j(a){a||(a=b);var d=f(a);return!y.shivCSS||p||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),q||i(a,d),a}function k(a){for(var b,c=a.getElementsByTagName("*"),e=c.length,f=RegExp("^(?:"+d().join("|")+")$","i"),g=[];e--;)b=c[e],f.test(b.nodeName)&&g.push(b.applyElement(l(b)));return g}function l(a){for(var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(A+":"+a.nodeName);d--;)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function m(a){for(var b,c=a.split("{"),e=c.length,f=RegExp("(^|[\\s,>+~])("+d().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),g="$1"+A+"\\:$2";e--;)b=c[e]=c[e].split("}"),b[b.length-1]=b[b.length-1].replace(f,g),c[e]=b.join("}");return c.join("{")}function n(a){for(var b=a.length;b--;)a[b].removeNode()}function o(a){function b(){clearTimeout(g._removeSheetTimer),d&&d.removeNode(!0),d=null}var d,e,g=f(a),h=a.namespaces,i=a.parentWindow;return!B||a.printShived?a:("undefined"==typeof h[A]&&h.add(A),i.attachEvent("onbeforeprint",function(){b();for(var f,g,h,i=a.styleSheets,j=[],l=i.length,n=Array(l);l--;)n[l]=i[l];for(;h=n.pop();)if(!h.disabled&&z.test(h.media)){try{f=h.imports,g=f.length}catch(o){g=0}for(l=0;g>l;l++)n.push(f[l]);try{j.push(h.cssText)}catch(o){}}j=m(j.reverse().join("")),e=k(a),d=c(a,j)}),i.attachEvent("onafterprint",function(){n(e),clearTimeout(g._removeSheetTimer),g._removeSheetTimer=setTimeout(b,500)}),a.printShived=!0,a)}var p,q,r="3.7.3",s=a.html5||{},t=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,u=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,v="_html5shiv",w=0,x={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",p="hidden"in a,q=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){p=!0,q=!0}}();var y={elements:s.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:r,shivCSS:s.shivCSS!==!1,supportsUnknownElements:q,shivMethods:s.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=y,j(b);var z=/^$|\b(?:all|print)\b/,A="html5shiv",B=!q&&function(){var c=b.documentElement;return!("undefined"==typeof b.namespaces||"undefined"==typeof b.parentWindow||"undefined"==typeof c.applyElement||"undefined"==typeof c.removeNode||"undefined"==typeof a.attachEvent)}();y.type+=" print",y.shivPrint=o,o(b),"object"==typeof module&&module.exports&&(module.exports=y)}("undefined"!=typeof window?window:this,document);
diff --git a/main-template.html b/main-template.html
index 652c1ab..730dd04 100644
--- a/main-template.html
+++ b/main-template.html
@@ -2,54 +2,54 @@
 <html lang="en"> <!-- Set this to the main language of your site -->
 <head>
     <meta charset="utf-8">
-    
+
     <title>HTML5 Bones :: PAGE TITLE</title>
-    
+
     <!-- Enter a brief description of your page -->
     <meta name="description" content="">
-    
+
     <!-- Define a viewport to mobile devices to use - telling the browser to assume that the page is as wide as the device (width=device-width) and setting the initial page zoom level to be 1 (initial-scale=1.0) -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    
+
     <!-- Add normalize.css which enables browsers to render all elements more consistently and in line with modern standards as it only targets particular styles that need normalizing -->
     <link href="css/normalize.css" rel="stylesheet" media="all">
     <!-- For legacy support (IE 6/7, Firefox < 4, and Safari < 5) use normalize-legacy.css instead -->
     <!--<link href="css/normalize-legacy.css" rel="stylesheet" media="all">-->
-    
+
     <!-- Include the site stylesheet -->
     <link href="css/styles.css" rel="stylesheet" media="all">
-    
+
     <!-- Include the HTML5 shiv print polyfill for Internet Explorer browsers 8 and below -->
     <!--[if lt IE 9]><script src="js/html5shiv-printshiv.js" media="all"></script><![endif]-->
 </head>
 <body>
 
     <!-- The page header typically contains items such as your site heading, logo and possibly the main site navigation -->
-    <!-- ARIA: the landmark role "banner" is set as it is the prime heading or internal title of the page --> 
+    <!-- ARIA: the landmark role "banner" is set as it is the prime heading or internal title of the page -->
     <header role="banner">
-    
+
         <h1><abbr title="HyperText Markup Language 5">HTML5</abbr> Bones</h1>
-        
+
         <!-- ARIA: the landmark role "navigation" is added here as the element contains site navigation
         NOTE: The <nav> element does not have to be contained within a <header> element, even though the two examples on this page are. -->
         <nav role="navigation">
-            <!-- This can contain your site navigation either in an unordered list or even a paragraph that contains links that allow users to navigate your site -->           
+            <!-- This can contain your site navigation either in an unordered list or even a paragraph that contains links that allow users to navigate your site -->
         </nav>
-        
+
     </header>
-    
+
     <!-- If you want to use an element as a wrapper, i.e. for styling only, then <div> is still the element to use -->
     <div class="wrap">
-    
+
         <!-- The <main> element is used to enclose the main content, i.e. that which contains the central topic of a document -->
         <!-- ARIA: the landmark role "main" is added here as it contains the main content of the document, and it is recommended to add it to the
         <main> element until user agents implement the required role mapping. -->
         <main role="main">
-    
-            <!-- The <section> element can be used to enclose content that comes under a related heading. 
-            NOTE: The <section> element can contain <article> elements and vice versa, if you think the content warrants it. -->        
+
+            <!-- The <section> element can be used to enclose content that comes under a related heading.
+            NOTE: The <section> element can contain <article> elements and vice versa, if you think the content warrants it. -->
             <section>
-            
+
                 <!-- This is the section's header. It contains the heading and navigation links for within the section -->
                 <header>
                     <h2>Getting Started</h2>
@@ -61,61 +61,66 @@ <h2>Getting Started</h2>
                         </ul>
                     </nav>
                 </header>
-                
+
                 <!-- The <article> element can be used to enclose content that still makes sense on its own and is therefore "reusable" -->
                 <article id="introduction">
-                
-                    <!-- A <header> element is not required here as the heading only contains a single <h3> element -->             
+
+                    <!-- A <header> element is not required here as the heading only contains a single <h3> element -->
                     <h3>Introduction</h3>
-                    
+
                     <!-- Content -->
                     <p>Welcome to <abbr title="HyperText Markup Language 5">HTML5</abbr> Bones. This is a template that contains comments to aid you with setting up your <abbr title="HyperText Markup Language 5">HTML5</abbr> document.</p>
-                    
+
                 </article>
-                
+
                 <!-- The <article> element can be used to enclose content that still makes sense on its own and is therefore "reusable" -->
                 <article id="instructions">
-                
-                    <!-- A <header> element is not required here as the heading only contains a single <h3> element --> 
+
+                    <!-- A <header> element is not required here as the heading only contains a single <h3> element -->
                     <h3>Instructions</h3>
-                    
+
                     <!-- Content -->
                     <ol>
                         <li>Read the comments in this template</li>
                         <li>Decide how you think your content may fit into the template</li>
                         <li>Start building your document</li>
                     </ol>
-                    
+
                 </article>
-                
+
             </section>
-            
+
         </main>
-        
+
         <!-- An <aside> is used to enclose content that is additional to the main content but not essential. If it were removed, the meaning of the main content should not be lost, but the content of the <aside> also retains its meaning.
         NOTE: the aside is placed outside of the <main> element as while its content is related to the content that is within the <main>
         element, it is not part of it -->
         <!-- ARIA: the landmark role "complementary" is added here as it contains supporting information for the main content that remains meaningful even when separated from it -->
         <aside role="complementary">
-        
-            <!-- A <header> element is not required here as the heading only contains a single <h3> element --> 
+
+            <!-- A <header> element is not required here as the heading only contains a single <h3> element -->
             <h3>Did you know?</h3>
-            
+
             <!-- Content -->
             <p>The article and section elements cause a lot of confusion when people are trying to decide how and when to use them. The article: <a href="http://www.iandevlin.com/blog/2011/04/html5/html5-section-or-article">section or article?</a> might help you choose.</p>
-            
+
         </aside>
-        
+
     </div>
-    
+
     <!-- The main page footer can contain items such as copyright and contact information. It can also contain a duplicated navigation of your site which is not usually contained within a <nav> -->
     <!-- ARIA: the landmark role "contentinfo" is added here as it contains metadata that applies to the parent document -->
     <footer role="contentinfo">
-    
+
+        <!-- The <address> element contains contact information for the nearest <article> or <body> element. This example is for the <body> -->
+        <address>
+          <p>For further information, please contact <a href="mailto:admin@example.com">Max Mustermann</a>.</p>
+        </address>
+
         <!-- Copyright information can be contained within the <small> element. The <time> element is used here to indicate that the '2016' is a date -->
         <small>Copyright &copy; <time datetime="2016">2016</time></small>
-        
+
     </footer>
-    
+
 </body>
 </html>
diff --git a/multimedia/audio.html b/multimedia/audio.html
index 1973c81..b0d3fd1 100644
--- a/multimedia/audio.html
+++ b/multimedia/audio.html
@@ -3,49 +3,49 @@
 <head>
     <!-- Define the page charset to be utf-8 -->
     <meta charset="utf-8">
-    
+
     <title><!-- Enter page title here --></title>
-    
+
     <!-- Enter a brief description of your page -->
     <meta name="description" content="">
-    
+
     <!-- Define a viewport to mobile devices to use - telling the browser to assume that the page is as wide as the device (width=device-width) and setting the initial page zoom level to be 1 (initial-scale=1.0) -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    
+
     <!-- Add normalize.css which enables browsers to render all elements more consistently and in line with modern standards as it only targets particular styles that need normalizing -->
     <link href="css/normalize.css" rel="stylesheet" media="all">
-    
+
     <!-- Include the site stylesheet -->
     <link href="css/styles.css" rel="stylesheet" media="all">
-    
+
     <!-- Include the HTML5 shiv and shiv print polyfills for Internet Explorer browsers 8 and below -->
     <!--[if lt IE 9]><script src="js/html5shiv-printshiv.js" media="all"></script><![endif]-->
 </head>
 <body>
 
-    <!-- This audio element tells the browser to display the default control set and to only preload the audio's metadata (e.g. video duration) --> 
+    <!-- This audio element tells the browser to display the default control set and to only preload the audio's metadata (e.g. video duration) -->
     <audio id="audio" controls preload="metadata">
         <!-- Provide multiple audio sources for cross-browser support -->
-        
-        <!-- MP3 source for Chrome, Safari, IE9+, iOS and Android 2.3+ 
+
+        <!-- MP3 source for Chrome, Safari, IE9+, iOS and Android 2.3+
         NOTE: For Android 2.2 support see below -->
         <source src="url-to-audio.mp3" type="audio/mp3">
-        
+
         <!-- Ogg source for Firefox, Chrome and Opera -->
         <source src="url-to-audio.ogg" type="audio/ogg">
-        
+
         <!-- Provide a Flash fallback for browsers that don't support HTML5 audio, e.g. Internet Explorer 6-8.
         This uses the JW Player Flash Player to play the MP4 file. Set the height and width attributes to the correct values. -->
         <object type="application/x-shockwave-flash" data="player.swf" height="24" width="320">
             <param name="movie" value="player.swf" />
             <param name="flashvars" value="file=url-to-audio.mp3" />
         </object>
-        
+
         <!-- Add a downloadable link for users who do not have a HTML5 audio capable browser, nor Flash installed
         NOTE: This link will be displayed even if the user has Flash installed -->
         <a href="url-to-audio.mp3">Download MP3 audio</a>
     </audio>
-    
+
     <!-- Use this if you need to support Android 2.2 devices -->
     <!-- Android 2.2 supports the audio tag but none of the codecs. However an MP3 file can be played in the video tag, although it does go to fullscreen mode. This is a possible workaround if Android 2.2 support is required -->
     <!--
@@ -57,17 +57,22 @@
     <!-- The main page footer can contain items such as copyright and contact information. It can also contain a duplicated navigation of your site which is not usually contained within a <nav> -->
     <!-- ARIA: the landmark role "contentinfo" is added here as it contains metadata that applies to the parent document -->
     <footer role="contentinfo">
-    
+
+        <!-- The <address> element contains contact information for the nearest <article> or <body> element. This example is for the <body> -->
+        <address>
+          <p>For further information, please contact <a href="mailto:admin@example.com">Max Mustermann</a>.</p>
+        </address>
+
         <!-- Copyright information can be contained within the <small> element. The <time> element is used here to indicate that the '2016' is a date -->
         <small>Copyright &copy; <time datetime="2016">2016</time></small>
-        
+
     </footer>
-    
+
     <!-- Required to initiate audio play in Android -->
     <script>
         // Use browser sniffing to check if it's a pre Android 4 device (some say browser sniffing is bad - but I think it's appropriate here)
         var isPreAndroid4 = parseInt(navigator.userAgent.slice(navigator.userAgent.toLowerCase().indexOf('android')+8)) < 4;
-        
+
         // If this is a pre Android 4 device, then add a click handler to play the audio and video when it is "clicked" (touched)
         if (isPreAndroid4) {
             var audio = document.getElementById("audio");
@@ -76,6 +81,6 @@
             if (video) video.addEventListener("touchstart", function() { video.play(); }, false);
         }
     </script>
-    
+
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/multimedia/video-with-subtitles.html b/multimedia/video-with-subtitles.html
index ecd962a..abd9292 100644
--- a/multimedia/video-with-subtitles.html
+++ b/multimedia/video-with-subtitles.html
@@ -3,21 +3,21 @@
 <head>
     <!-- Define the page charset to be utf-8 -->
     <meta charset="utf-8">
-    
+
     <title><!-- Enter page title here --></title>
-    
+
     <!-- Enter a brief description of your page -->
     <meta name="description" content="">
-    
+
     <!-- Define a viewport to mobile devices to use - telling the browser to assume that the page is as wide as the device (width=device-width) and setting the initial page zoom level to be 1 (initial-scale=1.0) -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    
+
     <!-- Add normalize.css which enables browsers to render all elements more consistently and in line with modern standards as it only targets particular styles that need normalizing -->
     <link href="css/normalize.css" rel="stylesheet" media="all">
-    
+
     <!-- Include the site stylesheet -->
     <link href="css/styles.css" rel="stylesheet" media="all">
-    
+
     <!-- Include the HTML5 shiv and shiv print polyfills for Internet Explorer browsers 8 and below -->
     <!--[if lt IE 9]><script src="js/html5shiv-printshiv.js" media="all"></script><![endif]-->
 </head>
@@ -27,38 +27,43 @@
     NOTE: Internet Explorer 9, 10,and 11 will ignore the poster image if any of the video is loaded. To force these browsers to support the poster image, set preload="none" -->
     <video id="video" controls poster="url-to-poster-image.jpg" preload="metadata">
         <!-- Provide multiple video sources for cross-browser support -->
-        
+
         <!-- MP4 source for Chrome, Safari, Internet Explorer 9+, iOS and Android
         NOTE: remove the type attribute from the MP4 <source> element to ensure older Android support -->
         <source src="url-to-video.mp4" type="video/mp4">
-        
+
         <!-- WebM source for FireFox and Opera (also Chrome and Internet Explorer 9+) -->
         <source src="url-to-video.webm" type="video/webm">
-        
+
         <!-- Include an Ogg video file to support Firefox 3.5 and 3.6 -->
         <source src="url-to-video.ogg" type="video/ogg">
-        
+
         <!-- Add subtitles. Most browsers require a polyfill (such as Playr - http://www.delphiki.com/html5/playr/) to implement this. No polyfill is needed for the latest version of Opera -->
         <!-- The subtitle files themselves are defined via the WebVTT file format (you can read more about this format at http://www.iandevlin.com/blog/2011/05/html5/webvtt-and-video-subtitles).
-        A sample WebVTT file is provided here (sample-english-subtitles.vtt) --> 
-        
+        A sample WebVTT file is provided here (sample-english-subtitles.vtt) -->
+
         <!-- Specify the WebVTT file that contains English subtitles for this video, and mark it as the default set of subtitles to be used -->
         <track label="English subtitles" kind="subtitles" srclang="en" src="english-subtitles.vtt" default>
-        
+
         <!-- Specify German subtitles that can also be chosen by the user -->
         <track label="Deutsche Untertitel" kind="subtitles" srclang="de" src="german-subtitles.vtt">
-        
+
     </video>
 
 
     <!-- The main page footer can contain items such as copyright and contact information. It can also contain a duplicated navigation of your site which is not usually contained within a <nav> -->
     <!-- ARIA: the landmark role "contentinfo" is added here as it contains metadata that applies to the parent document -->
     <footer role="contentinfo">
-    
+
+        <!-- The <address> element contains contact information for the nearest <article> or <body> element. This example is for the <body> -->
+        <address>
+          <p>For further information, please contact <a href="mailto:admin@example.com">Max Mustermann</a>.</p>
+        </address>
+
         <!-- Copyright information can be contained within the <small> element. The <time> element is used here to indicate that the '2016' is a date -->
         <small>Copyright &copy; <time datetime="2016">2016</time></small>
-        
+
     </footer>
-    
+
 </body>
-</html>
\ No newline at end of file
+</html>