big upgrade for future apps and gui
Merge pull request #17 from Dermenslof/dev

big upgrade for future apps and gui