Merge pull request #11 from v4l3nt1n/dev-maru

Merge pull request #10 from v4l3nt1n/master
branch sinc
Merge pull request #12 from v4l3nt1n/dev-valen

branch sinc
fix merge