Merge pull request #82 from vexxhost/improve-funcs

Improve funcs