Merge pull request #1 from TheNextMillionDollarIdea/master

Merging tabs functionality
merging
New interface
Merge pull request #5 from rmilosic/master

Merging new interface