More selective parsing
Improved readme