Cleanup
Merge branch 'file-dl' of https://github.com/4ndr3w/PaperPlane into file-dl