Fix wrapping helper
Add and update licence to Apache
Bump version to 0.2.4