Fixed a bug in the parser related with command parsing (see issue #21). Minor changes in the rest of the library.