Linus S and Linus S Merge branch 'refactor'