return to last working
updated version to 0.4
premerge