IDM changes
Merge pull request #97 from anilsaldhana/master

see comments