Rectified branches, finalized DLL and tests
Merge pull request #4 from BFriedland/dll

Rectified branches, finalized DLL and tests