Merge pull request #4 from pedroigor/master

Pushing idm branch changes to master
Merge remote-tracking branch 'upstream/master'