general fixes
Merge branch 'develop' of https://github.com/fofosudarko/isar into develop

Undoing latest files checkout
general fixes
general fixes