Merge pull request #2 from PavelVinogradov/master

Minor project refactoring