Merge with log/development.log
Update time decay factor
merge with master