testing fixed and cleanup#144

ananwolf wants to merge 3 commits intoteamDidUpdate:masterteamDidUpdate/FEC:masterfrom

ananwolf:masterananwolf/FEC:masterCopy head branch name to clipboard