Merged bkoo with master
Merge branch 'bkoo'
Merge branch 'master' into bkoo