Last fixes for version 0.2.6