Merge pull request #2 from Vadskye/master

Minor git upkeep and refactoring