shanmdphd Merge pull request #2 from asancpt/shanmdphd-patch-1