Merge pull request #1 from robertshilston/master

General update
Update to new health standard
Update built extension
Update to new health standard
Merge pull request #1 from triblondon/master

Pulling recent commits from upstream.