core improvements
Merge pull request #6 from odbaev/some-core-improvements

core improvements