Refactoring
Refactoring
Merge pull request #30 from darkzeroman/master

Refactoring