fixes
Merge pull request #5 from Wasper/resources

Resources
Features
Fixtures
Implementation