Added readme, support for comments, cleanup