Added some parsing methods. Threading is really weird and not working. Ask Jeff tomorrow what to do.
Merge remote-tracking branch 'origin/master'