Rafiot Merge pull request #71 from dgfscr/patch-1