Add tests
fix parameters
bump version
Merge branch 'master' of github.com:shaiis/resource-manager
Merge branch 'release/1.0.0'