marki jama
bugfixes
Merge branch 'marki-jama'
merge marki jama