Merge pull request #1 from pvanheus/master

Change to use functions, add test code
Merge pull request #1 from SANBI-SA/master

Merge pull request #1 from pvanheus/master