OOP Concept
Merge https://github.com/atiiuc/24-12-2014