Merge pull request #1 from coherans/dev

Dev
yep
Init
Merge pull request #2 from coherans/master

Merge