Minor changes
Merge pull request #415 from gergo85/patch-26

Minor changes