Merge pull request #17 from v4l3nt1n/dev-valen

Dev valen
Merge pull request #18 from v4l3nt1n/dev-maru

Merge pull request #17 from v4l3nt1n/dev-valen