Code

Merge remote branches 'avuton/master' and 'jn/dev'