minor changes
Merge pull request #1 from hoghug/dev

minor changes