Fixes
Merge
Fix missing argument
Version 0.3
Refactor services