Bug fixes, adjustments and README.

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>