Fixing a bug.
Merge branch 'release/0.0.4.1'