Initial commit
Merge remote-tracking branch 'qnote/master'