disposer fix
Merge remote-tracking branch 'origin/master'
#27 Organizing entries in groups
merge from master