Moved helpers to utils and exporting public API
Merge remote-tracking branch 'origin/master'