idm changes
Merge pull request #41 from anilsaldhana/master

see comments