better names; move helpers to their own module; reduce loc a bit
Merge branch 'fixes' into dev
update CHANGELOG
Merge branch 'release-0.0.4' into dev