Bug fix
Merge branch 'histograms_screen' of github.com:Aloja/aloja into test