Merge pull request #15 from v4l3nt1n/dev-maru

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

Merge pull request #15 from v4l3nt1n/dev-maru