Merge branch 'master' of https://github.com/marckregio/Polymorphism.git