Solved issue #2 (last commit was wrong)

Same as previous commit, but with the correct files