nodiscc Merge pull request #71 from jjasghar/patch-1