OS 30256
Merge branch 'master' of https://github.com/dramosti/Magnificus2014