includes added
Merge pull request #30 from n-ctrl/master

Code optimizing