minor fixes caused script errors for some users
Merge pull request #77 from o2ri/master

minor fixes caused script errors for some users