refactoring
fix bug after refactoring
Merge pull request #7 from Leon-G/refactoring

Refactoring