Merge pull request #459 from savvopoulos/patch-1