Ngoc/dev

THE AWESOME IS HERE.