Corrected 0.0.1 to pass unit tests
Merge branch '0.0.1'