Merge pull request #12 from mjkrumlauf/master

Modify to enable unit tests