final changes for the 0.2 version