Updated parser, closing 101companies/101wiki#148, 101companies/101wiki#126