Fixed issues with compiling
Merge pull request #2 from Stoiss/master

Fixed issues with compiling