Added tests for the previous merge
Extracted the logic out of the ScriptHandler

Closes #30
Simplified some logic
Updated the changelog
Added more badges in the readme