Added O'Reilly & fixes #1