duncan's code t1
Merge remote-tracking branch 'upstreamFuck/master'