Merge pull request #15 from alvinsj/last-refactoring

refactoring