Fixed Parsing. Much Much More elegant now.
Test Document and Runnable Jar.