Merge pull request #6 from aardv/rc

Bring back RC changes to develop