Refactor
Remove unused module
Fix, improvements for refactoring
Enhancements, fixes
Use latest Frege, enhancements
Merge pull request #6 from Frege/dev/refactor

Use latest Frege, refactor, enhancements