Some minor changes
Merge pull request #47 from elenagr/master

Some minor changes