Merge pull request #331 from pgreyson/master

Minor improvements