Version bump and updated dependencies
Code cleanup: removed redundancy
Merged conflict