Fixed file reading for jar, fixed waived field bug.
Merge branch 'master' of ssh://gh/MazMachine/Coen174