Merge pull request #94 from Gerry1135/morefixes
Merge pull request #94 from Gerry1135/morefixes

Morefixes