Minor changes
Merge pull request #417 from gergo85/patch-28

Minor changes