Inlined functions that should be
Merge pull request #15 from lundiorg/inlined-funcs

Inlined functions that should be