merged with master changes