initialization
Merge remote-tracking branch 'mbc/master'