ES6 post  refactoring
Merge pull request #21 from namshi/ES6-post-refactoring

ES6 post  refactoring