Migrate to Maven Annotations + small fixes
Merge pull request #10 from excilys/migrate-annotations

Migrate to Maven Annotations + small fixes