Up to 0.0.5
Add group support and refactor
Smaller changes