fix things
fix
fixed merge conflict
fixed merge again
Merge pull request #101 from kexline4710/fixes

Fixes