Fix + build scripts.
Merge pull request #1 from ozamiatin/master

Fix + build scripts.