Adding mikes as a test directory
Merge remote branch 'upstream/master'