Adding some useful moduls.
Resolves issue #1 and #3