unstable version
Many changes
Remove useless definition
fix path
Merge branch 'refs/heads/factoring'