Merge pull request #3 from JoeTheDentist/refactoring

Refactoring
Merge pull request #4 from JoeTheDentist/refactoring

Refactoring
Remove of windows executable
Merge pull request #7 from JoeTheDentist/cleanup

Remove of windows executable