minor changes
Merge pull request #267 from glenwks/master

minor changes