Merged at last, plus many changes.
Merge pull request #9 from kdop/master

modules merged