Minor changes
Merge pull request #416 from gergo85/patch-27

Minor changes