Last fixes. Version 0.2