More fixing compile errors
Merge pull request #6 from dejan-brkic/russ_master

More fixing compile errors