Simplified parsing, fixing JRuby bug in the process.
Version bump