Rewrote parsing of library's output
Fix previous commit