module id
Merge pull request #205 from digitalhero/master

module id part 2