Merge pull request #1 from The-Ancile-Project/frankie-r6

merge up from r7