Added new example
Code refactoring