Fixes
Merge pull request #7 from rampage644/refactoring

Fixes