Merge pull request #1 from AkimaLunar/master

fixes