git fixup and autosquash
Merge pull request #65 from cgcgbcbc/fix-up-and-autosquash

git fixup and autosquash