Refactoring + bug fixed
Merge pull request #2 from SinaC/master

Refactoring + bug fixed