Fixed parsing and example program