Merge pull request #135 from orodley/rplac-fix