Committing pull 19
Code refactoring