add changes from last version in stackrorge