Merge pull request #30 from victorgirotto/features

Update to module and resource creation