Merge branch 'nikitakit_master'