Fixing bugs, cron price calculation
Merge commit 'c9ddd032fa308663da3ad2fd6cbbcdc1ae1439b2'