Merge pull request #135 from dejan-brkic/master

MVP integration with UI