minor modifications
Merge pull request #1 from bgoli/master

minor modifications