completes 1.0.1 - unit tests added