update apy calculation#2

mirackk wants to merge 2 commits intoflamincome:masterflamincome/cmc:masterfrom

mirackk:mastermirackk/cmc:masterCopy head branch name to clipboard