a lot of things
fix bug
Merge pull request #10 from DanielBlack/merge-group-1

Merge group 1