Hotfix for debug mode
Doxygen compatible comments added
Merge branch 'Dokumentalas' into kridev
Merge branch 'kridev'