few fixes
Merge pull request #1 from Joseph-N/master

few fixes