merged danny branch with master