Refactor of core complete
Merge pull request #32 from ahellander/develop

Refactor of core complete