Some minor changes
Merge branch 'master' of github.com:crioto/idea27