Develop

Simply a merge into master from develop so we can create a tagged version against a master commit.

@clabrunda or @fosdev or @chaimsolomon Please review and merge when satisfied.