OS: 0028238
Merge branch 'master' of https://github.com/dramosti/Magnificus