Small bugfixes
Merge branch 'develop' of github.com:attosecondotto/AQM-tools into develop