code refactored
Merge pull request #67 from lwyszomi/refactor

code refactored