optimized build
Merge pull request #80 from gAmUssA/master

optimized build