public marks

PUBLIC MARKS from asteroza with tags osx & 2.0