rework utils
Merge pull request #28 from sir-sigurd/rework-utils

rework utils