Functions updates.
Merge pull request #5 from AuditeMarlow/niek

Functions updates.