Conflict virgin
Merge pull request #27 from Sbfrr/solve_conflicts

Conflict virgin