Merge pull request #34 from olerem/rc