more modules
Merge pull request #3 from larsrh/topic/modules

more modules