Version update. Finally fixed the xml parsing, cleaned up the code.

Results may differ now from previous version.