Fixed failing tests.
Merge branch 'release/0.1.4'