Merge cit260/master