Added some basic modules and
Merge pull request #2 from Wobbo/master

Added some basic modules