misc
Merge https://github.com/szpiech/asd