changes
Merge branch 'master' of https://github.com/Sijmen/Alitheia-Core