Merge pull request #6 from aardv/rc

Bring back RC changes to develop
Merge pull request #8 from aardv/develop

Merge pull request #6 from aardv/rc