hopefully fixed capacity issue, added minimum decay rate
Merge remote-tracking branch 'origin/master'