Adding more cases to parser, renaming and preparing as gem

Contribution in the public domain