fixing happy 1
Fixing happy 2
Merge pull request #1 from AkimaLunar/master

fixes