New RC view

Some work to make the pull #165 stay up-to-date with the master branch. Now it's ready for a merge.