Kiss!!!!! and some tweaks
Merge pull request #60 from kinglouisxiv/patch-9

Kiss!!!!! and some tweaks