Refactor + Version update
Merge