0.0.18

Changes made to resolve test fails.