Merge pull request #34 from wick-ed/master

diff reviewed and tested locally with 0.6.0
Merge pull request #36 from wick-ed/master

reviewed diff and tested locally with 0.6.0
changed rewrite module type