refactoring, cleanup, ...
Merge branch 'master' of https://github.com/FITeagle/core