Minor changes
Merge pull request #7 from dgianotti/master

update