Merge branches 'vasenin/license' and 'vasenin/test2'