mega merge
Merge branch 'dev' of github.com:Herzucco/squalala into dev