First working version
Merge pull request #1 from innni/frontend-part-1

First working version