Full update to version 0.2