Refactor the return values of core functions
Merge pull request #6 from TyMaszWeb/refactor-return-values

Refactor the return values of core functions