some fix
Merge branch 'dev' of https://github.com/winnlab/Agusha into dev