Major architecture change
Merge pull request #1 from unusorin/develop

Major architecture change