solved part of compilation problems
Merge pull request #2 from sagittarius89/master

solved part of compilation problems