Fixed MLVA imageView problems
Merge branch 'master' into steven