Refactoring build-scripts
Merge pull request #135 from ialekseev/master

Refactoring build-scripts