Merge pull request #546 from neheb/srt