Code cleanup, preparing for the beta release
Merge pull request #10 from AlexZabavsky/dev

Code cleanup, preparing for the beta release