fixes
Merge branch 'master' of https://github.com/pf4d/feism-refac