With unit test fixed
Merge pull request #2 from GreatBigBore/upstream

With unit test fixed