folded in most recent changes
changed version and name