Build issues.
Merge pull request #6 from evaleev/master

Build issues.