Added gitignore
Initial refactoring, maybe a few more loose ends
Merge pull request #7 from ilyalukyanov/refactoring

Refactoring