Ambiguity fix
Merge branch 'autoencoder' into autoencoder-latest