try to get Richard's updates

hope this will be a pull request from Richard's repo to update mine.