first working unified version
fix repository update on make
fix typo
Merge pull request #7 from ezpaarse-project/unified

Unified