Major revision: version 0.2