add Id to exported modules
Merge branch 'master' into answers
Merge branch 'answers' into answers-nodeps