Merge pull request #793 from remakeelectric/rme-master-tweaks