Added criteria COM11. Reorganised source in preparation for issue #33.
First compiling version of Java wrapper (issue #33)
Fixed issue #33