Initial version, remarkes fixed