Fixed compile errors + added missing files
Merge pull request #1 from Jusonex/master

Fixed compile errors + added missing files