Updated changes
Merge pull request #340 from awiddersheim/patch-15

Updated changes