Merge branch 'develop' into 'master'

Updated to work with new CNNArchLang version

See merge request !28
2 jobs for master in 4 minutes and 52 seconds (queued for 1 minute and 12 seconds)
Status Job ID Name Coverage
  Windows
passed #431436
Windows10
masterJobWindows

00:01:24

 
  Linux
passed #431437
masterJobLinux

00:03:27