S46 r01 r06

Here is my pull request.  It's working on my computer. Make sure it works on yours too.