Updates
Merge branch 'server-page' of https://github.com/azapps/mirakel into server-page
Bugfixes