Merge pull request #1273 from rzhxeo/rtlnow