Merge pull request #343 from astern7/master

some relatively minor issues