added parser
added tests