[fix/bugs] now actually working!
Merge branch 'fix/bugs' into development