Fix renamed enum constant.
Merge branch 'master' into rbm
Set minimum number of batches to 1.
Fix crucial bug.