public marks

PUBLIC MARKS from fredbird with tags dev & license:gpl