added header file, test file
implemented test function
Merge branch 'cleanup'