resolve most errors
Merge branch 'master' of github.com:sarike/timefly