Initial working beta
Merge pull request #1 from christianvozar/master

Initial working beta