Merge pull request #178 from amikheychik/master

Override default classes with our own
Code-style fixes