Merge pull request #10 from v4l3nt1n/master

merge sinc
Merge pull request #11 from v4l3nt1n/dev-maru

Merge pull request #10 from v4l3nt1n/master