Commit to release v0.4.2: general bug fix & performance improvement.