proper refactoring
smallfix
Merge branch 'master' of github.com:m10914/FETT_framework