Merge pull request #1 from maff91/dev

Dev
v-0.0.1 Front