Merge pull request #2 from aardv/hotfix-1

Merge Hotfix into Master
Merge pull request #7 from aardv/rc

Release 1.0
Merge pull request #8 from aardv/develop

Merge pull request #6 from aardv/rc
Merge pull request #9 from aardv/master

Master