Minor changes
Merge pull request #428 from gergo85/patch-36

Minor changes