Merge pull request #2 from fiddyspence/master

this works
reverting f5v11 to f5_v11
reverting f5v11 to f5_v11 for everything
many fixes