Lund3481 issue 10

I had to fiddle a bit with the permissions of the files, so it will look like I'm adding more files than I actually am. If this merge causes any more issues, I'll jump on the issue quickly.